Merge branch 'FeatureX'
removed line
updated master branch
added line
Revert "added line"

This reverts commit 56c2284903ab4a38519d3f87b1f4f07ddacc58b4.
some code to merge up from master