[GAIA] - Final patch prepared
Merge pull request #260 from michalbe/b6527-nfc-temp

[GAIA] - Final patch prepared