Modified after alpha - new functionalities and defect fixes include.
Revert "Modified after alpha - new functionalities and defect fixes include."

This reverts commit 01cde53812558a8112acf8674f0d24c3aec84978.
Revert "Revert "Modified after alpha - new functionalities and defect fixes include.""

This reverts commit 6ea1acf5a6726a185695fd0ee999d3256eeb5435.